Tests stub replaced with @todo
Merge branch 'master' of https://github.com/zosiakropka/academia