improve code

improve code testing...