Adding tests for new rebuild.