improve testing
improve tests