Added a couple test commands. Resolved issues 49,51,52.