Fixed tests /vrutberg