Addition of more tests, more are required though