Update, mainly added tests (for triangle)