Changes in some failing test classes (due to changes in the Vme model)