Addressing feedback and adding regression tests