More API changes and standardization.
Further standardizations and cosmits.
Further cosmits and adding test script.