parts of test code removed