Refactoring signature to reflect happens signature, tests updated accord...

As proposed at https://github.com/serpentem/aware/issues/3