A bunch of tests and more impl work.