adding new scope to work on class, adding some tests