More tests to satisfy coverage
DRY refactor