Added "say goodbye" methods and unit tests