More definitions and tests