Added notes for refactoring further down the line, small test adjustment.