fixed typos and tests