Changed names of a few tests. Coverage: 61.6%