Got classes to work with minimal test case