Disabled some tests, reordered modules