Add tests for and fix argument retaining and clearing

Signed-off-by: Alexsander Akers <a2@pandamonia.us>