Changed unit test accordingly