Add missing unit tests