Ohops, pull didn't really work. Adjusted unit test too.