Minor refactoring: use class variables
Add GCM buffer (incl. test)