#136 Separated debug and debug flag for testing into 2 variables