Added missing files and Unit test.