DRY up code [Tests 0.0.3]
DRY up code [Tests 0.0.4]