Add more tests to force a proper implmentations