Slimmed down some unit tests, added new ones