Minor correction

Got rid of break to avoid thread hanging
System tools unit tests done