Tests: Fixed errors with Unit tests.