Added more unit test to holder