Fix unittests
Get coverage back to 100%