Tests added (manually merged with testing branch
Merge branch 'master' of github.com:svanschooten/genesis