dding files missed in last commit, plus more tests.