Closes #165
Fix with/without test when undefined