Moved test to final location