Repair some logic in matching.
Adding simplecommands to unit tests. Not all return frames or commands. fixes #43 but not done fixing.