moved tests around, still not sure if I like the format :/