tests working 88%