Changed unit tests but does not work properly at the moment