Improved tests, and wrote two tests for deletion