o. Clean up testings.
o. Misc minor tweaks