Fixed extra space caused tests to fail...