[bug 1045982] Use modelmakers and cleanup tests.