Ensure the correct declarations are used, add mq modifiers
Update the test for default output
Add another test