finish basic unit tests to returns and comments