Add extra tests and silence expected errors