! some fixes for tests, more to come