WIP - organizing test directory a little
WIP - more organizing of test directory
WIP - finished moving tests to dedicated files, but they don't all pass yet