Fixed tests, and added some more.