Restructured tests

That one long file was just getting ridiculous