Noticket: Improved logic behind a couple of tests that use commands to ensure a specific error is happening for tests to pass.