added more cucumber tests, added master layout template
added layout