More unit testing, added google analytics