[VP] added TODO and some tests