...and some more fixes on tests and code-style