Syntax formatting fixes and 4 new tests