updated source & test analysis