typos; fixed tests