Fixes (and @Ignore) remaining test failures

Signed-off-by: Michael Vorburger <mike@vorburger.ch>