varius changes
Prepared the test for production use