Unit test update + code update