Updated to the latest fluid version, fixed the tests
More test fixing
Completely re-worked tests
Ah-HA!
Merge pull request #5 from grahamgilbert/master

Updated to the latest fluid version, fixed the tests