Trying to speed up tests with only partial success. Stop is taking way too long
re-enabling full test suite and cutting down runtime. Still way too slow but better