Support helpers
Fix typo and cleanup test