get rig of factory in test
get rid of factories at all
add anntotations