Updated per 1:1 suggestions.
Updated tests.