Cleanup alert messages & create tests for errors