Updates #15 by adding some test cases