Fixed notification and removed test menu option