code clean up
test credentials container changed
factory changed
code cleanup