Moving test into its right place