More tests, more bug fixes