Updated so all unit-tests are successfull