Moved test to proper folder