Sessions and added more tests