Merging in changes from master / fixing unit test