Added more unit test and test files