Fixed whitespace
Improved code covereage for unit tests