fixed up some tests due to recent changes