Fixed tests to make them correct