Update src and tests