Refactor - Rename tests to be more human readable
Refactor - remove extra constructors