Cleaned up comments and test data