Fixed up per comments
Settings save when changed only
Test button moved to modal footer