More tests with a hint of refactoring

use _ for spaces