more test coverage; most core methods complete