Add tests. Remove const.