Changes from code review
Fixture file and directory added