Add factory tests
Merge pull request #8 from Bodigrim/feature/factory-tests

Add factory tests