Refactor and bug fix
Finish up clock out feature test