Updated the test samples to add some more edge cases