added a few extra asserts for more robust tests