Fixed more incorrect expected values in test