We got dinged for having multiple assertions in one test for beta. Maybe see if some of the tests in here could get split up into multiple tests. Could be a separate pull request though