Refactored camresolutiontest to a single class

Sorry for the extra commits, sloppy!