Minor code & test updates