Updating unit tests, tests were wrong