Adding compliance tests