Renaming according to the scala style guide
Added one session test