Removed tilde'd file, fix one spec test