Rebuild; fix test