Fixed tests. One test is commented out.