Merge "Removing old signature test, migrating to new one." into klp-dev