Revert "SamuelTest - Return of the Commit"

This reverts commit 93e0e8eb0a6fa79b0d8b2d1b374b0d458d999534.