Fix broken unit tests
Fix broken unit tests

Lukasa/hyper,irvind/hyper,masaori335/hyper,lawnmowerlatte/hyper,fredthomsen/hyper,Lukasa/hyper,lawnmowerlatte/hyper,plucury/hyper,masaori335/hyper,plucury/hyper,fredthomsen/hyper,irvind/hyper