Moved "scratch" functionality to dedicated test class