I broke wcfs test while trying to implement rebuild.
Keep wcfs tests passing while rebuild is not finished yet.