fixes to outdated tests