FIX unit tests