Updated definitions, and added tests