More code cleanup in tests/vanilla directory