fixing spacing and tests