Cleaned up comments, added test file