Coverage

Test coverage ant style fixes