Fixed src and tests