add datadriven tests, add abbreviation tests