Moved a Few Constants / More Tests