Implement strict mode - need to refactor the expectation checking though.