Cleanup and reorganize tests

Currently the test are kind of a mess with lots of legacy functions testing the pre-context functionality. Need to go through, cut out the old crap, rewrite functions to handle contexts and generally clean up everything in the tests.