Updated and created tests