Reorder makefile test variables
Update debian packaging