Fix equality tests and characteristic mocking at the end of session