test suit improvements