Improve requirement tests