Updated - Unit test