Fix some tests. Add Google Analytics tracking code