Cleaning up; test coverage increase; using es6 proxy on driver