Update unit tests so they hopefully work right