added some unit tests

12/17 passing