Refactoring of some tests, more tests work