Finished module split to core and pdp, one test is still failing