Reports updates
service provider code entry patch
test code generator fix