Various fixes

Going through and fixing some of the tests that were written for this branch.