Not functional tests, but still improving
Merge branch 'dev' of https://github.com/Ormazz/ESIR3-SR-katch into dev