#ADD: Add some test cases