Fix U-O-U for ER-only Us

Signed-off-by: Michael Buesch <m@bues.ch>
Add more U-O-U tests

Signed-off-by: Michael Buesch <m@bues.ch>