Remove inline function, use real one instead
Add hash functions.
Fix tests.