More work on cloudtack mock