Remove dependency on oscar-testsupport