Test support, initial commit
Fixed few typos