Remove some test code from base