Continuing update on preintapi tests