Ref #335, Ref #334 - Disables broken tests