removing test code and changing deafults