test cases extended (now correct)