Improve tests & add new terms tests