added fixture tests and rake task for generating fixture tests
Merge branch 'master' into deployment