Cleaned up creation & deletion unit tests