Added optional strict constraint test