Update test battery with new expect syntax