DAR-2130 | Signup tests - fixes after CR