Fixed UTs that left EHCache dangling