Revisited unit tests and some other minor tweaks.
Removed success var usage in the unit tests.