Added pairs, closable tests