re-organize test for new structure