Tests, Notify bug and clean up