typos; fixed tests
PARTIAL