some more changes to mock, also added factory
npmv