Fix layout and many tests