Added factories for tests, some artwork tests, fixes.