Add tests for remaining flags