Handle --version..
fix tests