fixed almost all tests