UnitTests and bug fixes
Removed tabs