Fix memory overrun in get_context -- may want to revisit and use dynamic string of ints?
Reorganize tests, start towards trying to cover all commands