Cleaned up tests.  All green again.  Significant improvements in usability and error handling of deck uploading page