Add test for importing fields into the 'extra' dict
remove obsolete html (that I introduced)
add weird hack to metrics.py to make most of tests pass again