implemented most tests; fixed a few grammar issues