updated test syntax, made factory
Added additional tests, more but not all things working