.lock removed, .json updated to user autoload-dev, autoload for tests updated