Additional Tests (WIP)
Merge branch 'master' into feature/microblogging2