Restore tests that were removed as part of modularization.

BUG: expCos

Extra Delete's were present.

Change-Id: I22e087762481283acd12502a470f54ab3db9f71e