Cost tests almost passing