Revert undocumented parts of last change (readds tuskar)
remove quantum from unit testing