fixed some factories and updated specs