Fix warning, and better tests for __VA_ARGS__