merging code + Junit testing Runner

sa10g10 & cf4g09