Add support for test flags.
Add support for categories controlled with the -categories flag