passes, but not exactly fixed
fixed those tests finally
fixed spec file