added testcase + made enabling classname more backwards compatible (only turn it on if fname in't turned off