Fixed tests and refactored PointsPowerupTest