Add test code & cleanup

Signed-off-by: Rick Copeland <rick@synapp.io>