switched to newFixedThreadPool
clean up
update unitTests