Make these public for easier testing