Brought tests up to date with Scala Common Enrich 0.8.0 (695