First commit in Moritz-branch
Added test