Get rid of intermediate beam files
Add the reasonable subset of the old resources tests