Fixed broken tests / commented some parts of activity implementation for now.