Rename test files more appropriately.  Change header.  Put controls in a more specific location.