Fixed tests that seem to have broken due to a recent merge. Please remember to PULL before doing your merge and (maybe) do a test run post-merge to make sure things are still good!