Break out tests, cmds into new files