Adds more tests to scrambler
Refactors scrambler plugin