More comments and fixing tests