Updated some test code to use sizeof()