Fixing tests after target changes