Unit test modified