augmented test coverage + minor adjustments