Changed names of a few tests. Coverage: 67%