Added floors
Added some service integration tests
Added one controller (json) integration test