improve macro hygiene with fully qualified class names
fix CommandsTest