diff --git a/src/test/classroom.js b/src/test/classroom.js
index 54d058aee1e5f213c6c8ba92d28dcdf812462354..bd520cf8b67ad396f8251092bf0a4036bb65e36a 100644
--- a/src/test/classroom.js
+++ b/src/test/classroom.js
@@ -25,6 +25,48 @@ const server = require(`${libs}/app`);
 chai.use(chaiHttp);
 describe('request classrooms', () => {
 
+    it('should list the locations', (done) => {
+        chai.request(server)
+            .get('/api/v1/classroom/location')
+            .end((err, res) => {
+                res.should.have.status(200);
+                res.should.be.json;
+                res.body.should.have.property('result');
+                res.body.result.should.be.a('array');
+                res.body.result[0].should.have.property('id');
+                res.body.result[0].should.have.property('name');
+                done();
+            });
+    });
+
+	it('should list the administrative dependencies', (done) => {
+		chai.request(server)
+			.get('/api/v1/classroom/adm_dependency')
+			.end((err, res) => {
+				res.should.have.status(200);
+				res.should.be.json;
+				res.body.should.have.property('result');
+				res.body.result.should.be.a('array');
+				res.body.result[0].should.have.property('id');
+				res.body.result[0].should.have.property('name');
+				done();
+			});
+	});
+
+	it('should list the detailed administrative dependencies', (done) => {
+		chai.request(server)
+			.get('/api/v1/classroom/adm_dependency_detailed')
+			.end((err, res) => {
+				res.should.have.status(200);
+				res.should.be.json;
+				res.body.should.have.property('result');
+				res.body.result.should.be.a('array');
+				res.body.result[0].should.have.property('id');
+				res.body.result[0].should.have.property('name');
+				done();
+			});
+	});
+
     it('should list classrooms', (done) => {
         chai.request(server)
             .get('/api/v1/classroom')
@@ -111,7 +153,7 @@ describe('request classrooms', () => {
 
     it('should list classrooms with valid filters', (done) => {
         chai.request(server)
-            .get('/api/v1/classroom?filter=locality:1')
+            .get('/api/v1/classroom?filter=location:1')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
@@ -195,13 +237,13 @@ describe('request classrooms', () => {
 
     it('should list classrooms with valid dimensions', (done) => {
         chai.request(server)
-            .get('/api/v1/classroom?dims=locality')
+            .get('/api/v1/classroom?dims=location')
             .end((err, res) => {
                 res.should.have.status(200);
                 res.should.be.json;
                 res.body.should.have.property('result');
                 res.body.result.should.be.a('array');
-                res.body.result[0].should.have.property('locality');
+                res.body.result[0].should.have.property('name');
                 res.body.result[0].should.have.property('total');
                 done();
             });