Got ListMonad tests working
Cleanup code