Moving test to where it belongs