Ve 742 fixes

Updating tests for the VE entry point test. Grouping tests by entry points.