diff --git a/entrypoint.sh b/bin/entrypoint.sh
similarity index 100%
rename from entrypoint.sh
rename to bin/entrypoint.sh
diff --git a/bin/xvfb-chromium b/bin/xvfb-chromium
new file mode 100755
index 0000000000000000000000000000000000000000..b76838d956d601222b294eb06bfa3af1e8de0e05
--- /dev/null
+++ b/bin/xvfb-chromium
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Wechaty Helper - https://github.com/wechaty/wechaty
+#
+# Credit:
+# https://github.com/mark-adams/docker-chromium-xvfb/blob/master/images/base/xvfb-chromium
+# http://stackoverflow.com/a/30336424/1123955
+#
+set -e
+
+_kill_procs() {
+  kill -TERM $pidXvfbChromium
+  wait $pidXvfbChromium
+}
+
+# Setup a trap to catch SIGTERM and relay it to child processes
+trap _kill_procs SIGTERM
+
+XVFB_WHD=${XVFB_WHD:-640x480x8}
+
+# Start Xvfb
+# Xvfb :99 -ac -screen 0 $XVFB_WHD -nolisten tcp &
+xvfb-run -a chromium --no-sandbox $@ &
+pidXvfbChromium=$!
+
+# export DISPLAY=:99
+
+# chromium --no-sandbox $@ &
+# chromium=$!
+
+wait $pidXvfbChromium
+# wait $xvfb
diff --git a/src/config.spec.js b/src/config.spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d4b4748dc76976ee7fb4e50bbb8de31cdf669b5
--- /dev/null
+++ b/src/config.spec.js
@@ -0,0 +1,15 @@
+import { test }   from 'ava'
+import { Config } from './config'
+
+test('Config Module Exports', t => {
+  t.truthy(Config.default   , 'should export default')
+  t.truthy(Config.Config    , 'should export Config')
+
+  t.true(typeof Config.isDocker !== 'undefined' , 'should identify docker env by isDocker')
+
+  t.truthy(Config.DEFAULT_PUPPET  , 'should export DEFAULT_PUPPET')
+  t.truthy(Config.DEFAULT_PORT    , 'should export DEFAULT_PORT')
+  t.truthy(Config.DEFAULT_PROFILE , 'should export DEFAULT_PROFILE')
+})
+
+