removed dependency on test for core