Refactored the tests and migrated some to Spock.
Added some failing tests to illustrate the expected outcome structures