making progress to fix broke tests but still needs work