add comment and cleanup tests