added redirects and got rid of test data