Updated with new testbenches