Fixed some failing unit tests cc @simoncropp ;)