fixing and refactoring test assertions; adding TODO about later invocations of assertMetrics
fixing and refactoring test assertions; adding TODO about later invocations of assertMetrics

cosminrentea/gobbler,smancke/guble,smancke/guble,cosminrentea/gobbler