Moved test to new class