Fixed existing tests

Just some small tweaks to get all of the tests passing again. Functionality changed and the tests were not kept up to date.