Added untested tests