Added tests: take two.