Added new tests, switched debug off in cpp