split test-funcs a bit, re-enable hashes