Test simplification

I was going nuts finding a particular test, that's why I re-structured the tests package a bit.