Organzied the code bit better

Change-Id: Ic2583f8a9f1f96cd5f59fdb749dfa9aabd9c50a6
Disabled the gradient opacity test for now

Need to find a better dataset

Change-Id: I07538bb17bade78e497bca4516acbeea0596a487