More Testing and Cleanup

Signed-off-by: Justin Yost <justin.yost@yostivanich.com>