Updated models with session class, added more tests