Test suite base and setup reestructure