Added test notifier and moved redirecting code