reordered tests to logical order