worked almost exclusively on obsolete tests to make them run again. In preparation of gradle.