Fixing the first couple tests...