More debugging routines added to test buttons