Fixing feature tests