first batch of tests, more error message fixes