Just reporting steal and not guest metrics, updating tests, cleaning up metadata