Make ready for testing. Change a lot.