Remove scope for test purposes