Updated test variables (commit: c767dbb)
rpid is optional (commit: 2ef01a2)
Added dates (commit: e7f3cef)