all tests seem to work now