Fixed the test passing issues from before