Fixed the spacing
Fixed the unit tests