Refactor much stuff that isnt working
Reduce test count 100->10. Fix test broken by refactor.