Fix Unit tests
Merge branch 'master' of https://github.com/matijsmoest/psd_team2