Handler Tests Finished with the corrections applied to make handler works