Separation of test and non-test supervisor, cleaner nosetests output.