Cleanup + using tests