Removed tests (HA!) and fixed notifications