moved tests around again, for real this time though