Fixes on the unit testing part.