Added more test cases and introduced IOUtils