Queue renamed and debug tests added