Much better tests!