tons of tests and grammar added