Fix & expand tests.  Still needs more, though