Fleshed out more e2e equipment tests