updated tests and layout