Minor changes before tests