Refactor the tests to use sizeof too