add comments, remove outdated unit tests