clean up help & add tests