Fixed better tests and fixed progress in the tests.