Add Unit Tests and Session-variable usage