small test fixes, removed a mangled duplicate