Changing spacing and modifying test to use Single instead of Any