tests2: move into tests