Remove commented codes
Update the test to allow a null value for a parameter