Bugfix: Removed dep on non exported test class, replacing with core ri
class. Made test class package protected, so Eclipse will not try to
import it.