move tests, more bug fixes