Moved test to its proper class