Fixed spacing
Fixed spacing again
Updated tests slightly