added some rigid test conditions