Added ParseType and tests