Added new init methods

Added new init methods and cleaned up minor typos and unnecessary test
code.