Making BayDAR test more flexible