Fix where site_style broke some tests, fix other test failures
Authored by: Rick Copeland 2010-03-17
Parent(s): [1d9f63]
Child(ren): [51bbbe]