removing additional VelocityContexts, use internal vc instead
Fixing the test cases