Many changes to tests and stuff.