Fixed unit test and updated comments