added tests and two different layouts