Move non unit test to separate directory
Fix error in test