Added a few more requirements to improve tests.