Basically rewrite of all tests and test confs. #8