Fixing some unit tests 99.35%