Add missing unit tests

Tests still fail