Width & height right way round. Fix scope of test vars