layout and test refactor finished