Update test coverage and minor style changes