Remove needless main()
Fix null error message displays by adding missing parent constuctor call
Improved formatting and comments
Remove accidentally added test source file