Add missing bits to unit test