some speed tuning of the tests
speded up some tests
removed the extra test_settings.py file and embedded the relevant part