Rewrite/add Pipeline tests