add tests, additional terms