moved test, and added new test