Tests and ui tweaks