Removing test file.  Some minor code changes.