Fixes tests to use core unit test data only