#21 Properly added the test for setup this time
Merge branch 'dev/ilja'