Add test unit for #30