Fixed failing tests.
Removed dependency on midje.