Adding tags to scenarios
Function.Class_ -> Function.class_
Some improvements to unit test, a) moving stuff to setUp, b) using helpers to create mocks