Add more options to Bat test