Moving test to better folder