Added fixtures tests and fixed some typos.
Merge branch 'hotfix/minor_fix'