refactoring of tests, first test for 2.4 done. would be great to get testing time down