Refactor names, add test page