Cleaned up some comments / other tests