Reordered tests. Updated version info