Merge "Adding more unit tests for hwc VTS"