fixed remaining specs