Updated comments and added test