Add missing new files and add unit tests