Added back accidentially removed unit test