Created some tests and layouts