Updated test framework
Fixed instantiation issue with the CompanionGenerator and added a test