Upgraded test script a bit.
Merging, because.