Merging in latest unit test to refactor branch