Testing and tweaks