#2: Move tests into a better location