Tests are Almost Always passing now
Had totally left out Q and E