Add more tests and sessions model/helper