Testing/TestBA cleanup.