Clean up test, add more logging