rearranging testing flows
update when to 2.0 and fixing issues created