Increasing test coverage and an attempt to keep them DRY and descriptive.