Tab / space fixes, functional test updates