More tests, fixing some error messages