Just some tweaking on Scratch Tests