Cleaned up test program