Merge "Removing Bootup tests." into klp-dev