Some updates including better tests.