merge frist tests into new structure