Added tests, package files