updated according tests