More comments and test coverage