refaktorointia
Merge branch 'development' into AnttiBranch
refaktorointia ja testien fixausta