Updated comments and fixed testing