Clean up on unit tests and constructors