Revert change to Sample.Tests