Renamed some test and fixed issue.