Added a space as requested in the PR
Fixed a bunch of unit tests