Refactor tests so order doesn't matter
Fix spurious failing test cases