work on the test somemore and fixed a layout