Done, we now reuse the core from the testframework