Added missing test cases (Flush still needs fixing)