renamed and fixed some tests