Add tests, code fix
Slight wording changes