Add missing files from previous commit + add missing unit test