Tweaked script DSL. Added tests for scripts.