major clean up in the test branch