Fix tests and remove old files.