Cleanup; more settings testing