Fixed unit tests to handle all classes being pre-mapped to objects