Here's a bunch of stuff added to the E3 test and a complete rehaul of E2 and E3