Attempted tests fix