Fixed test code to use correct sizes
Add DEBUG def if debugging