refactor test names and and layout presenter