Canvas layout test improvements