Added back other tests