Updated some failing tests to fit our code