Merge pull request #12 from justindarc/camera-refactor

Updated basic functional Python tests to work with Camera refactor.