Issue 318

I have picked some UAs from th list linked within Issue #318 and added tests for them. No other actions were nessesary.