Added Eric's unit test