Addressed @ericsnowcurrently comments and tests
Go fmted