Adding unit tests and 1000 lines of testcases