Fix failing unit tests
Merge branch 'master' of github.com:stnatic/tcs-organizer