Code follow up on run method and more testunit code ..