more optional whitespaces and updated tests