#OLYMP-1 - jacoco coverage reports
Also fixed some performance issues