Fix tests, improve tests, and even fix some mistakes!