Refactor title and test suite slightly