fuycing bullshit with tests fixed