Fixes tests and updates template and catalog entry