Update sources and tests