Addressing review comments, converting tests to use spaces