Updating some more tests, finding issues with implementation