Add capabilities to cheat. Expand testing to cover.