Moved some functions from current to testing