Fixed typos, modified tests