Added tests.
Merge branch 'feature/tests'
Updated fixtures.