Revert "small changes + an opacity test"

This reverts commit e36172b208ed75dc573002fbac89d4bd9aef2a1d.