Refactor fix and add test