Fix Lockfile feature and add additional tests