Move tests out
Add layout