This is working with test creation (partial), pre-beta