Reordered tests and added dotall option to some