Added more tests to Camera

Lost DI on serviceLayer. This will have to be solved...