use guard-compat to fix broken tests
Merge pull request #22 from e2/e2-use_guard_compat

use guard-compat to fix broken tests