Cleaning up self test and dynamide tests.