all issues - (testing) refractor tests by Michael Spitzer