Fixed test to work with an explicit operator bool
Merge remote-tracking branch 'upstream/develop' into gpu-enabled-2