Added the rest of the EFC calculator unit tests, fixed typos