Fixed a bug in the shrinker and improved it slightly. Cleaned up ServerTest.hs