Updated compute tests to work with new meta models

Change-Id: Ib09a6ab7ddaf1ad94f797de1d3cf2bd2b20ba8b5
Merge "Updated compute tests to work with new meta models"