fixed error and commented unwritten tests