Removed tests
updated default settings