Added a bunch of check expects