Remove test code from base files