Increase test coverage and detail