Added Scalers, updated test