Issue 511

I have added tests for the Uas mentioned in #511 and all missing rules. This should solve Issue #511.