Update src files and unit tests