Asst'd warning/windows fixes
Add test and fix bustage