Adding more tests and fixing equations.