Moved to required parameter only and fixed broken test