Added metadata and better test cases