two failing test cases fixed