refactor(unit): deal properly with comments and flesh out coverage