Rehabilitate ok and type acceptance tests