restructured tests to aceptance and unit