Added buffer options function
Started refactoring tests