Cleaned up callbacks spec