Add tests (failing) for to/from handling
Fix test data
Fix a bug when @has is unset