organized test directories
cleanup on the steps