Added better tests.