FIX: Errors in unit tests