Improved testing situation by a lot. Still have to convert some of the older tests to work thouhg