new test & little cleanup