A little refactoring
Update green (no skipping)
More tests
1.0.2