Added Activity and tests