Added activity
added tests