Changed unit tests