added delete, improved testing