Minor refactoring to split two asserts into two tests