Remove inline functions, use tests.