1) Testers added.
2) Code clean up.