Moved test to better location