rest of tests and fixes