Deletion and registration test code updated
Tidying up the test code