Add comments
Move tests into a directory so we do not have a single gigantic test file