Improved camera, added unit testing

Improved camera, added unit testing