consolidate more, next will be adding more tests