Fixing fluent asserts and removing our test shims