Adding basic tests + adding more test cases