Add fixtures for testing
Merge branch 'master' of github.com:FFM/FFM