added many conditions test cases as well almost done with the conditions parsing method