More unit tests, all still work