Only run travis against master
Fix and add some factories
wip