FIX more unit tests