Moved test class