Refactored some random stuff and added a new test for Camera.