adding more test cases

getting rid some codes that is causing errors and adding more test
cases