Added tests

Also changed some grammar issues :+1: