Added location attribute
Updated test and modal