Symplify.
Some specs for bad scenarios.
Little refactoring.
Add some fixtures.