VX(Li): Add more unit tests (complex path). Fix style cop issues