Merge "Fix rebuild server tests for wrong input"