Add manual notification contril, tidy up and add trace to the test suite