Fixed some tests that were broken by the last fix

My fault for not using all the test files. *headdesk*