added define, tests