More tests, fixed error