Improved tests, added shorthand req, opt and seq