improve tests
edit tests