FIX: Several testing fixes