Changes for tests