Remove test-util from base

Code before stored in base (as test helper) was merged with the module testing.