Move test into own file