Fix test cases, update contributors, encapsulation to hide lib internals