fix a bad test

Change-Id: I7f533682e6f31dea4ea717196365ca3cb8d8dca1
minor cleanup to a test

Change-Id: Id304b2fb51cc0b907892a753e4b417c5e3c597b5
Merge topic 'depth_peeling' into master

793f23e0 fix a bad test
Merge topic 'cleanup_test' into master

27f5b465 minor cleanup to a test