Coverage

Test coverage and style fixes