updated/removed some outdated tests