Removed the unittest features added in 2.7