Adding some more test suites, about to refactor Factory tests to mirror file structure better
More tests, refactoring test file structure