Changes made to test cases to be more independent(#136)