TEST: fix test references, enable tests, minor changes.