COMMON: add tests