Added more thorough CRUD testing