Added Bini.default_dir, rewrote keys, cleaned up a test block.