* added linear-subpeptides and cyclic-subpeptides and tests