Add tests, fix sort by creator