Added flexmock, changed tests to be simpler