adapted unittests to core cleanup