Added safety tests