Adding tests, citation info