changed order of unit tests