Last tweaks for testing