Updated tests and comments