add more tests to review & user