fixed some broken tests, added some, >50% cpverage