Played around with moving test class definitions into a fixture and rearranged directories a bit.