Minor fixes; add tests to bad setup