fixing tests, remove session dependency