Reintroduce other tests