fixes to tests and impl