Consistent variable names with constructor
Removes unnecessary new Buffer
Fixes #167 and adds temporary test