Fixes all tests & adds some