Added definition constants to clean up test classes