Fix travis
Fix travis take 2
Fix travis take 3
Merge pull request #323 from wilsonge/fixtests

Fix FOFController tests