Fixed two tests I accidentally broke
Merge branch 'test_bug_fix'