Added TODO and added argument checking for test URL