Better consts for testing