working on full test passage