Partial, tidy up, delete tests not working