Refatored SessionStorage braking internal dependencies, impelmented unit tests