Improved test run message, fixed an evil bug
Improved and extended tests