Added some smart validation to test options