Update tests so they work