Updated tests and fixed comment errors