Fix timezone
Add test merchant