Fix layout
Updated test list