Merge "Make unit tests not crash"