Did tests and fixed some spelling