Cleaned up some testing code and comments