fix src and tests