fixes to remove raspberries from tests