TestCase1 fully working
Merge remote-tracking branch 'origin/develszaki'