unit test fix and restoring src folder