Merge "Fix: unit test IllegalStateException"