rethink of tests and other stuff