WIP defined testing, charm needs work